Bug 539466 – GtkMenuShell API/ABI break in trunk.

2008-06-21  Carlos Garnacho  <carlos@imendio.com>

        Bug 539466 – GtkMenuShell API/ABI break in trunk.

        * gtk/gtkmenushell.h: Fix API/ABI break, two guint fields had
        different name and packing width.

svn path=/trunk/; revision=20666

diff --git a/ChangeLog b/ChangeLog
index 19c57e4cf45f8bb2cc3d400a0ddb538cc1eaeba5..13a9023e2db9ff9cfb999e192ed4176c5ae85558 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-21  Carlos Garnacho  <carlos@imendio.com>
+
+       Bug 539466 – GtkMenuShell API/ABI break in trunk.
+
+       * gtk/gtkmenushell.h: Fix API/ABI break, two guint fields had
+       different name and packing width.
+
 2008-06-21  Johan Dahlin  <jdahlin@async.com.br>
 
        * gtk/gtkiconcachevalidator.c (check_pixel_data): Cast to guint8* to avoid

diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index ffb294fe62ff779cd305e4e2dffe066503d51f4b..b38051e47aab06664c748531416ebfe3a63b2bd8 100644 (file)
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -63,8 +63,8 @@ struct _GtkMenuShell
   guint GSEAL (active) : 1;
   guint GSEAL (have_grab) : 1;
   guint GSEAL (have_xgrab) : 1;
-  guint GSEAL (unused1);
-  guint GSEAL (unused2);
+  guint GSEAL (ignore_leave) : 1; /* unused */
+  guint GSEAL (menu_flag) : 1;    /* unused */
   guint GSEAL (ignore_enter) : 1;
 };